Merge "Add UserGroupMembership details to the UserGroupsChanged hook"